Added some BugFixes | BETA

Added some bugfixes... I need to test each case.