Begun adding support for new things

Also did some cleaning up
Oh, and added Bass type