added limit cmd + small changes
minor method working changes
added more exception-handling