Edited/revamped and added stuff.