better classpath elements processing

Signed-off-by: Ketoth Xupack <ketoth.xupack@gmail.com>
demo title fixes

Signed-off-by: Ketoth Xupack <ketoth.xupack@gmail.com>