Some bug fixes and added addition. Now time to do some cleaning