BugFixes and more

Important bug fixes done and ready for next itteration