Project bugs all fixed!

Fix #354 
Fix #353 
Fix #352