Revert "major fixes, careful it is a little "loose""

This reverts commit 1c1ae77a7b2268d3c991e9abb4d7be5c62484813.