171214 Testing and Fixes

-Tested last days work and fixed and reworked everythin that didn't work
as intended