Added & implemented systemtest, fixed lots of bugs