Fixed little bugs, design issues