Fixed some bugs, added some features. Peace out.