Major Bug fixes and very small changes

Signed-off-by: Orangescrum <developer@orangescrum.com>